Bug #549251. No need to set name if there is no a11y item object.

2008-12-23  Li Yuan  <li.yuan@sun.com>

        * gtk/gtkiconview.c: (gtk_icon_view_accessible_model_row_changed):
        Bug #549251. No need to set name if there is no a11y item object.

svn path=/trunk/; revision=21926

diff --git a/ChangeLog b/ChangeLog
index 9533713bf1c14d88686427e22010b61b39f367ab..469688e242b0d6f8a633e99cfa71d7cbb4d015fd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-23  Li Yuan  <li.yuan@sun.com>
+
+       * gtk/gtkiconview.c: (gtk_icon_view_accessible_model_row_changed):
+       Bug #549251. No need to set name if there is no a11y item object.
+
 2008-12-21  Yair Hershkovitz  <yairhr@gmail.com>
 
        Bug 565203: RTL locales: icons are misplaced when horizontal 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 81ef0bded7ea65b00b3101e89b5b58dd979b06ec..4afb10b383b9a77e7998eee018850c4fda620b9a 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -8891,20 +8891,23 @@ gtk_icon_view_accessible_model_row_changed (GtkTreeModel *tree_model,
   index = gtk_tree_path_get_indices(path)[0];
   a11y_item = gtk_icon_view_accessible_find_child (atk_obj, index);
 
-  widget = GTK_ACCESSIBLE (atk_obj)->widget;
-  icon_view = GTK_ICON_VIEW (widget);
-  item = a11y_item->item;
+  if (a11y_item)
+    {
+      widget = GTK_ACCESSIBLE (atk_obj)->widget;
+      icon_view = GTK_ICON_VIEW (widget);
+      item = a11y_item->item;
 
-  name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
+      name = gtk_icon_view_item_accessible_get_name (ATK_OBJECT (a11y_item));
 
-  if (!name || strcmp (name, "") == 0)
-    {
-      gtk_icon_view_set_cell_data (icon_view, item);
-      text = get_text (icon_view, item);
-      if (text)
+      if (!name || strcmp (name, "") == 0)
         {
-          gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
-          g_free (text);
+          gtk_icon_view_set_cell_data (icon_view, item);
+          text = get_text (icon_view, item);
+          if (text)
+            {
+              gtk_text_buffer_set_text (a11y_item->text_buffer, text, -1);
+              g_free (text);
+            }
         }
     }